diff --git a/DebuggerFeaturePkg/Library/DebugAgent/GdbStub/GdbStub.c b/DebuggerFeaturePkg/Library/DebugAgent/GdbStub/GdbStub.c
index 28f70a0..c351f4e 100644
--- a/DebuggerFeaturePkg/Library/DebugAgent/GdbStub/GdbStub.c
+++ b/DebuggerFeaturePkg/Library/DebugAgent/GdbStub/GdbStub.c
@@ -282,8 +282,8 @@ ProcessVCommand (
   UINT32  CommandLength
   )
 {
-  UINT8  OriginalDelimiter;
-  UINT8  DelimiterIndex;
+  UINT8   OriginalDelimiter;
+  UINT32  DelimiterIndex;
 
   // Replace the ; or ? with a terminator;
   for (DelimiterIndex = 0; DelimiterIndex < CommandLength; DelimiterIndex++) {