Patch by Curt Brune, 07 Jul 2004: