Changed download url parsing, old way could cause trouble in rare cases