Here is a naive patch which fixes it for me.