Bugfix: better click handling