diff --git a/GradleExternalBuildPlugin.zip b/GradleExternalBuildPlugin.zip
index 789bbb0..5e79a0e 100644
Binary files a/GradleExternalBuildPlugin.zip and b/GradleExternalBuildPlugin.zip differ
diff --git a/src/net/nonylene/gradle/external/ExternalBeforeRunTaskTool.kt b/src/net/nonylene/gradle/external/ExternalBeforeRunTaskTool.kt
index f5e135c..068418a 100644
--- a/src/net/nonylene/gradle/external/ExternalBeforeRunTaskTool.kt
+++ b/src/net/nonylene/gradle/external/ExternalBeforeRunTaskTool.kt
@@ -19,12 +19,12 @@ class ExternalBeforeRunTaskTool(val tasks: List<String>, val commandLineArgument
         workingDirectory = state.workingDirectory
 
         val tasks = tasks.fold(StringBuilder()) { builder, text ->
-            builder.append(text)
+            builder.append(text.replace(",", "\\,"))
                     .append(',')
         }.toString()
 
         val args = commandLineArguments.fold(StringBuilder()) { builder, text ->
-            builder.append(text)
+            builder.append(text.replace(",", "\\,"))
                     .append(',')
         }.toString()