Fix for double slashes problem