Fighting against "too many events" bug