[CustomFields] Repaired form