Set properly (26/37)

Set properly