Fix yet another issue with offsetting by 8 for indices