Set properly (16/37)

Set properly