Fix multiple-value properties