diff --git a/lib/core/common.py b/lib/core/common.py
index cd8a2675b..560232e23 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -575,9 +575,9 @@ def replaceNewlineTabs(inpStr, stdout=False):
         return
 
     if stdout:
-        replacedString = inpStr.replace("\n", " ").replace("\t", " ")
+        replacedString = inpStr.replace("\n", " ").replace("\r", " ").replace("\t", " ")
     else:
-        replacedString = inpStr.replace("\n", DUMP_NEWLINE_MARKER).replace("\t", DUMP_TAB_MARKER)
+        replacedString = inpStr.replace("\n", DUMP_NEWLINE_MARKER).replace("\r", " ").replace("\t", DUMP_TAB_MARKER)
 
     replacedString = replacedString.replace(kb.misc.delimiter, DUMP_DEL_MARKER)