form_handler fix