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