Set properly (9/37)

Set properly