Set properly (30/37)

Set properly