BugFix on EventHandling