Fixed do_define_form some more