Fix issue with paths