Fixed an issue in the Listener.