Hotfix on url generation