Issue with url-building; fix