diff --git a/tiramisu/value.py b/tiramisu/value.py
index f5afe1a..a14ae83 100644
--- a/tiramisu/value.py
+++ b/tiramisu/value.py
@@ -76,6 +76,7 @@ class Values:
                                                      setting_properties,
                                                      option_bag.properties,
                                                      'value')
+        # FIXME hu? validated or is_cached?
         if not validated:
             # no cached value so get value
             value = await self.getvalue(option_bag)
@@ -169,8 +170,7 @@ class Values:
                          value,
                          reset_cache=True):
         if isinstance(value, Calculation):
-            value = await value.execute(option_bag,
-                                        leadership_must_have_index=True)
+            value = await value.execute(option_bag)
         elif isinstance(value, (list, tuple)):
             value = await self._do_value_list(value, option_bag)
         if reset_cache: