#8 url fix