diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteConnection.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteConnection.java
index 548f8fd818d..09974fd7678 100644
--- a/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteConnection.java
+++ b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/internal/core/RemoteConnection.java
@@ -68,8 +68,7 @@ public class RemoteConnection implements IRemoteConnection {
 	@SuppressWarnings("unchecked")
 	@Override
 	public <T extends Service> T getService(Class<T> service) {
-		String serviceName = service.getName();
-		T obj = (T) servicesMap.get(serviceName);
+		T obj = (T) servicesMap.get(service);
 		if (obj == null) {
 			obj = connectionType.getConnectionService(this, service);
 			if (obj != null) {