fix for listener?