fixes wrong url generation --- SQUASH ME