Further fix for mouse persisting

Should eliminate the bug now.