Fixed so empty values can be saved