bugfix: listener calls