Fixed bug when submitting form
Merge branch 'hotfix/v0.54'