[fix] undo 64a8b76e7ae6a8ccf7df463f66cbdf6ede99d7f6 which broke double indexing