A try to fix a bug with events ignoring reported by Anikeev