Bugfix for url2 handling