diff --git a/src/generator.h b/src/generator.h
index 0e3c50a..a31a978 100644
--- a/src/generator.h
+++ b/src/generator.h
@@ -1497,6 +1497,16 @@ void Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::CallSpace
 	if( !IsTestingFunctionExistence() )
 	{
 		DumpSpaceIfNeeded(result, parameters, space);
+
+		if( HasParam(parameters, L"index") )
+		{
+			result.stream << space_wrapper.get_space_iterator_value(model_wrapper_space_table_index);
+		}
+
+		if( HasParam(parameters, L"index-one") )
+		{
+			result.stream << (space_wrapper.get_space_iterator_value(model_wrapper_space_table_index) + 1);
+		}
 	}
 }