fix issues related to modifier and how we invaliate previous events