An alternative is the patch that I proposed earlier: