Set properly (8/37)

Set properly