fixed parsing for new file format