Fix issue with _ in folder names