#244: Fix the case the submit button is not clicked