Fixed a problem with wrong Events being consumed