Mouse click handler correction