Fix for listeners