Set properly (6/37)

Set properly