diff --git a/kiss/src/kiss/Macros.hx b/kiss/src/kiss/Macros.hx
index 24041621..73f246c1 100644
--- a/kiss/src/kiss/Macros.hx
+++ b/kiss/src/kiss/Macros.hx
@@ -494,8 +494,11 @@ class Macros {
             }
 
             macroCallForm += ')';
-            if (optIndex == -1)
+            if (optIndex == -1) {
                 optIndex = minArgs;
+            } else if (restIndex == -1) {
+                restIndex = optIndex + 1;
+            }
             if (restIndex == -1)
                 restIndex = optIndex;