Fix/too many events