Fixed URL bad behaviour