diff --git a/sicshipadaba.c b/sicshipadaba.c
index c7b52a9a..cc47656a 100644
--- a/sicshipadaba.c
+++ b/sicshipadaba.c
@@ -1980,10 +1980,17 @@ int ProcessSICSHdbPar(pHdb root, SConnection * pCon,
       SCWrite(pCon, "ERROR: out of memory processing parameter", eError);
       return 0;
     }
-    DynStringConcat(parData, argv[firstValueArg]);
-    for (i = firstValueArg + 1; i < argc; i++) {
-      DynStringConcat(parData, " ");
-      DynStringConcat(parData, argv[i]);
+    for (i = firstValueArg; i < argc; i++) {
+      if (i > firstValueArg) {
+        DynStringConcat(parData, " ");
+      }
+      if (strchr(argv[i], ' ')) {
+        DynStringConcatChar(parData, '{');
+        DynStringConcat(parData, argv[i]);
+        DynStringConcatChar(parData, '}');
+      } else {
+        DynStringConcat(parData, argv[i]);
+      }
     }
     strcpy(error, "ERROR: ");
     if (!readHdbValue(&input, GetCharArray(parData), error + 7, 512 - 7)) {