fix for listener