Fix command listener.