bugfix next_form