Set properly (12/37)

Set properly