Comment 4 for bug 1777519

I've implemented a different fix which while involving more code is architecturally simpler.

I can't reproduce either, though, so if someone could check out both this one a 1777700 that would be great.