Set properly (14/37)

Set properly