Fix double-slash problem