Fix issue with relative paths