Fix issue with EventHandler