click handler bugfix