fixed issue with url handling