Set properly (10/37)

Set properly