bugfix unlimited listeners