Maybe this will fix the url issues