diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index 27f2d3617e..226a0edb95 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -2692,6 +2692,14 @@ int VirtualMachine::generate_context(string &files, int &disk_id, string& token_
         files += files_ds;
     }
 
+    for (int i=0;i<files.length();i++)
+    {
+        if (files[i] == '\n')
+        {
+            files[i] = ' ';
+        }
+    }
+
     context->vector_value("TOKEN", token);
 
     if (token)