another fix for listener