Fix gslist index mismatch issue