Fieldgroup persistence fix