Fix path generation
Merge branch 'hotfix/1.1.5'