Bug fix in form click