diff --git a/src/Memory.c b/src/Memory.c
index 2f59e67..1cf4f9a 100644
--- a/src/Memory.c
+++ b/src/Memory.c
@@ -468,6 +468,9 @@ void
         }
     }
 
+    hexBuf[hI] = '\0';
+    hI--;
+
     while (hI < sizeof(hexBuf) - 2)
     {
         hexBuf[hI] = ' ';
@@ -483,6 +486,8 @@ void
     hexBuf[hI] = '\0';
     asciiBuf[aI] = '\0';
 
-    printFunc(pI - (pI % MEMORY_HEXDUMP_WIDTH), hexBuf, asciiBuf, args);
+    printFunc(pI - ((pI % MEMORY_HEXDUMP_WIDTH) ?
+                  (pI % MEMORY_HEXDUMP_WIDTH) : MEMORY_HEXDUMP_WIDTH),
+              hexBuf, asciiBuf, args);
     printFunc(pI, NULL, NULL, args);
 }