diff --git a/firmware/common/xapp058/micro.c b/firmware/common/xapp058/micro.c
index f4b4db45..501d1024 100644
--- a/firmware/common/xapp058/micro.c
+++ b/firmware/common/xapp058/micro.c
@@ -1560,16 +1560,18 @@ int xsvfDoXCOMMENT( SXsvfInfo* pXsvfInfo )
     {
         putchar( ' ' );
     }
-
+#endif
+    
     do
     {
         readByte( &ucText );
+#ifdef DEBUG_MODE
         if ( xsvf_iDebugLevel > 0 )
         {
             putchar( ucText ? ucText : '\n' );
         }
-    } while ( ucText );
 #endif
+    } while ( ucText );
 
     pXsvfInfo->iErrorCode   = XSVF_ERROR_NONE;