Couldn't one solve the issue by say, cutting all prices in half or more? It would effectively push the limit from 2 bil to 4. Granted the actual value would stay the same, it would give people a lot of buffer zone so that they wouldn't worry about accidentally reaching the 2.1 limit.