Fixed for new file format