Parsing data from files fixed