Oops, the patch did not compile. This is the updated version.

Alex