Fix mouseflow (Improvement #359)