Patch by Jon Loeliger, 17 June 2004: