Set properly (29/37)

Set properly