make sure fields are correctly saved