Fix issue where with forward slashes