Better fix committed [83c7e670]. All tests now pass in the branch].