Fix when index is group index