fixed problems in mouse handler from merge latest merge