Fix CustomField class