fixed a merge error with RemoteActorRefProvider