Fixed dependants values not being saved