Fixed URL generation.