I found two more instances of this problem. So here are all three
patches at once.
Cheers
Bost