Fix RemoteService