diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTools/Source/Python/AutoGen/UniClassObject.py
index aa54f4fbd6..f900eac1d9 100644
--- a/BaseTools/Source/Python/AutoGen/UniClassObject.py
+++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py
@@ -293,8 +293,8 @@ class UniFileClassObject(object):
             if ((Line.count(u'"', 0, CommentPos) - Line.count(u'\\"', 0, CommentPos)) & 1) == 1:
                 CommentPos = Line.find (Comment, CommentPos + 1)
             else:
-                return Line[:CommentPos]
-        return Line
+                return Line[:CommentPos].strip()
+        return Line.strip()
                 
 
     #