diff --git a/SystemTools.cxx b/SystemTools.cxx
index bcf769cbd00b72b65881b85a84aa703103976a1c..81b55b46936dcdf11524013b396d86ed69c3d163 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -692,7 +692,6 @@ void SystemTools::ConvertToUnixSlashes(kwsys_std::string& path)
     }
   
   // if there is a /tmp_mnt in a path get rid of it!
-  // stupid sgi's 
   if(path.find("/tmp_mnt") == 0)
     {
     path = path.substr(8);
@@ -1302,6 +1301,11 @@ kwsys_std::string SystemTools::CollapseFullPath(const char* in_relative,
     {
     newDir = SystemTools::GetCurrentWorkingDirectory();
     }
+  // if there is a /tmp_mnt in a path get rid of it!
+  if(newDir.find("/tmp_mnt") == 0)
+    {
+    newDir = newDir.substr(8);
+    }
 #endif
   
   // Restore original working directory.