diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java
index afb0964a4b5..91d3307a426 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java
+++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java
@@ -726,15 +726,11 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
 		else
 		{
 			StringBuffer buf = new StringBuffer(remoteParent);
-			if (remoteParent.trim().equals("/")) //$NON-NLS-1$
-			{
-				buf.append(name);
-			}
-			else
-			{
-				buf.append(getSeparator(remoteParent));
-				buf.append(name);
+			String sep = getSeparator(remoteParent);
+			if (sep.length()>0 && !remoteParent.endsWith(sep)) {
+			    buf.append(sep);
 			}
+			buf.append(name);
 			de = getElementFor(buf.toString());
 		}
 		dsQueryCommand(de, IUniversalDataStoreConstants.C_QUERY_GET_REMOTE_OBJECT, monitor);