diff --git a/func_renamer.py b/func_renamer.py
index 305d7849bdf5441d27e278089cdf3e01ce153422..ce52ec6d4aca71af6634cbf422049030fbf1fc23 100644
--- a/func_renamer.py
+++ b/func_renamer.py
@@ -53,9 +53,15 @@ def MakeQword(addr):
 
     return int(listing.getDataAt(addr).value.toString(), 16)
 
+def range_printable(start):
+    prev = start
+    while memory.getByte(start) != 0:
+        prev, start = start, start.next()
+    return prev
+
 def MakeString(addr):
     addr = intToAddress(addr)
-    listing.clearCodeUnits(addr, addr, False)
+    listing.clearCodeUnits(addr, range_printable(addr), False)
     listing.createData(addr, CSTRING)
     return listing.getDataAt(addr).value