Hopefully I've fixed the URL resolution issues