BTestFieldsCustom fix