do_and_form & do_or_form fixed