Fixed filepaths issue