Set properly (20/37)

Set properly