bugfix
Merge branch 'hotfix/path_error'