Fixing behaviour for listeners