Fixed CheckIndex bug. 623/1781+ tests passing