fix click handling