Quick fix for listener