Set properly (13/37)

Set properly