fixing up the form
Merge branch 'hotfix/2.1'