Fix bug with URLs not resolving correctly