* Patch by Jon Loeliger, 02 Sep 2004: