Fixing URL creation. I wrecked this in a previous commit