Mouse bug fix