Patch to support bad URLs