* Patch by Robert Schwebel, 10 Jun 2004: