Fixed EventHandler initiation