Now has proper self index context