Fix parsing data