diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/Critic.java b/Tools/Source/MigrationTools/org/tianocore/migration/Critic.java
index 881d3aae2c..fb966103a0 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/Critic.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/Critic.java
@@ -50,6 +50,9 @@ public final class Critic {
 			while ((line = rd.readLine()) != null) {
 				if (line.matches("\\/\\*\\*")) {
 					incomment = true;
+					description = false;
+					arguments = false;
+					returns = false;
 					templine.append(line + "\n");
 				} else if (line.matches("\\*\\*\\/")) {
 					incomment = false;