Set properly (5/37)

Set properly