Fixed url wrapping