[IMPORTANT] Path corrections
Merge pull request #1902 from creocoder/path-corrections

[IMPORTANT] Path corrections