Issue #146 ghost click issue
debug
Merge branch 'Issue146' into issue146test

* Issue146:
  debug
  Issue #146 ghost click issue
Fixed 146 with test to prove