WEB-4596 - I *think* this is resolved, but I actually couldn't reproduce the problem in the first place, so it's hard to know.  It might come up again, but I do believe this accounts for the border case...