Fixed a problem with wrong Events being consumed Nr 2