Mouse fix part 2