Patch by Jon Loeliger, 16 Jul 2004: