Fix index and PTS