Fix an issue with folder names