Fixing listener.