Merge "Fix bad index usage"