removeListener bugfix