Set properly (21/37)

Set properly