Set properly (23/37)

Set properly