Fix issue where multiple properties from same fieldset would cause dictionary to break.