bugfix next_form

(cherry picked from commit 99693ff63564672d8c21f1888375529aca064feb)