fixed bug with event pushing refactor