Attempt to fix double-slash problem