Set properly (7/37)

Set properly