Set properly (31/37)

Set properly