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