Fix url generator