Avoid lost events (bug #3694)