Fix indexing on 2.4