Fixed issue with joining filepaths