Set properly (22/37)

Set properly