Tweak setFieldValues method