diff --git a/client/operation.go b/client/operation.go
index 30c0ff2..8e08605 100644
--- a/client/operation.go
+++ b/client/operation.go
@@ -166,7 +166,20 @@ func zipLogFiles(storageRoot string, req *shared.UploadRequest, start, except st
 
 func prepareProcessLaunch(storageRoot string, req *shared.StartProcessRequest) *procmeta {
 	re := regexp.MustCompile(`[^\s"']+|"([^"]*)"|'([^']*)`)
-	args := re.FindAllString(req.Args, -1)
+	argsTemp := re.FindAllString(req.Args, -1)
+	var args []string
+	for _, arg := range argsTemp {
+		if strings.HasPrefix(arg, `"`) && len(args) > 0 {
+			lastarg := args[len(args)-1]
+			if strings.HasSuffix(lastarg, "=") {
+				args[len(args)-1] = lastarg + arg
+			} else {
+				args = append(args, arg)
+			}
+		} else {
+			args = append(args, arg)
+		}
+	}
 
 	if len(args) == 0 {
 		return nil