Fix index ambiguity