mouse handling hot-fix