Pin Index Fix