More code to be patched. Reported by Thomas Ruf.