fix bug issue 1342 - cancelButton
Merge remote-tracking branch 'carter/bug-fix-1342' into develop

* carter/bug-fix-1342:
  fix bug issue 1342 - cancelButton