Fix submit button bug
Merge branch 'hotfix/1.6.8'