diff --git a/code/DeltaKustoLib/CommandModel/CommandBase.cs b/code/DeltaKustoLib/CommandModel/CommandBase.cs
index 133db03..4e36f17 100644
--- a/code/DeltaKustoLib/CommandModel/CommandBase.cs
+++ b/code/DeltaKustoLib/CommandModel/CommandBase.cs
@@ -296,7 +296,10 @@ private static string ReplaceFirstOccurence(string script, string oldValue, stri
         private static IEnumerable<string> SplitCommandScripts(string script)
         {
             var lines = script
-                .Split('\n')
+                .Split(
+                    new string[] { "\r\n", "\r", "\n" },
+                    StringSplitOptions.None
+                )
                 //  Remove comment lines
                 .Where(l => !l.Trim().StartsWith("//"));
             var currentCommandLines = new List<string>();