This change is an actual functional change. It may well be correct, but I'd like to see a test that is broken and fixed for this one, and the similar one on line 125.