diff --git a/source/java/org/alfresco/filesys/repo/CacheLookupSearchContext.java b/source/java/org/alfresco/filesys/repo/CacheLookupSearchContext.java
index af6dbe15fb..8717032c41 100644
--- a/source/java/org/alfresco/filesys/repo/CacheLookupSearchContext.java
+++ b/source/java/org/alfresco/filesys/repo/CacheLookupSearchContext.java
@@ -193,7 +193,7 @@ public class CacheLookupSearchContext extends ContentSearchContext {
     protected void setDotDotInfo(FileInfo finfo) {
     	m_dotDotInfo = finfo;
     	if ( m_dotDotInfo != null)
-    		m_dotDotInfo.setFileName( ".");
+    		m_dotDotInfo.setFileName( "..");
     }
     
     /**
diff --git a/source/java/org/alfresco/filesys/repo/ContentDiskDriver.java b/source/java/org/alfresco/filesys/repo/ContentDiskDriver.java
index 709c9bdadb..e36093fae0 100644
--- a/source/java/org/alfresco/filesys/repo/ContentDiskDriver.java
+++ b/source/java/org/alfresco/filesys/repo/ContentDiskDriver.java
@@ -1161,7 +1161,7 @@ public class ContentDiskDriver extends AlfrescoDiskDriver implements DiskInterfa
                         WildCard wildCard = new WildCard( searchFileSpec, false);
                         PseudoFileList filterList = null;
                         
-                        for ( int i = 0; i > pseudoList.numberOfFiles(); i++)
+                        for ( int i = 0; i < pseudoList.numberOfFiles(); i++)
                         {
                             PseudoFile pseudoFile = pseudoList.getFileAt( i);
                             if ( wildCard.matchesPattern( pseudoFile.getFileName()))
@@ -1244,7 +1244,9 @@ public class ContentDiskDriver extends AlfrescoDiskDriver implements DiskInterfa
             			
             			// Searching the root folder, re-use the search folder file information for the '..' pseudo entry
             			
-            			cacheContext.setDotDotInfo( finfo);
+            			FileInfo dotDotInfo = new FileInfo();
+            			dotDotInfo.copyFrom( finfo);
+            			cacheContext.setDotDotInfo( dotDotInfo);
             		}
             		else {