Fix regression in indices