Donnchadh O Donnabhain Just pushed this. But as there was no test case, I could just fix the specific line indicated here. No idea if somewhere else might break down as well.

Gail Badner I pushed this to master (5.0). I'll leave it up to you if you want it in 4.3...