Fix the paths?