Fix for get, setFieldValues