Set properly (28/37)

Set properly