bugfix eventhandling