Fixing EventHandler design