Still fixing BaseField.getFieldValue