backport mouse fix