Fix Client - Listener