Fix the data path