Commit No. 8 - index file bug fix