Fix - fields in groups which are arrays get broken. We should trim not reset