diff --git a/BaseTools/Source/Python/Common/MultipleWorkspace.py b/BaseTools/Source/Python/Common/MultipleWorkspace.py
index 8088404f30..feb1f8d5eb 100644
--- a/BaseTools/Source/Python/Common/MultipleWorkspace.py
+++ b/BaseTools/Source/Python/Common/MultipleWorkspace.py
@@ -41,7 +41,7 @@ class MultipleWorkspace(object):
     @classmethod
     def convertPackagePath(cls, Ws, Path):
         if str(os.path.normcase (Path)).startswith(Ws):
-            return os.path.join(Ws, Path[len(Ws) + 1:])
+            return os.path.join(Ws, os.path.relpath(Path, Ws))
         return Path
 
     ## setWs()