diff --git a/src/string_utils.h b/src/string_utils.h
index 784f39ef..596fb874 100644
--- a/src/string_utils.h
+++ b/src/string_utils.h
@@ -162,8 +162,9 @@ int64_t cstring_array_token_length(cstring_array *self, uint32_t i);
 
 void cstring_array_destroy(cstring_array *self);
 
-#define cstring_array_foreach(array, s, code) {                                         \
+#define cstring_array_foreach(array, i, s, code) {                                      \
     for (int __si = 0; __si < array->indices->n; __si++) {                              \
+        (i) = __si;                                                                     \
         (s) = array->str->a + array->indices->a[__si];                                  \
         code;                                                                           \
     }                                                                                   \