Version 2.1.2 with safeguard for index file that arrives part way through