fixed URL creation