* Patch by Kurt Stremerch, 03 Sep 2004: