Fix custom form