Fixed do_define_form