Addresses URL overflow bug