Fix
Slashes fix
Merge branch 'hotfix/hotfix'