Removed event match checking until fixed