Fix the remote service issue