Fixing events being pushed