* Patch by Martin Krause, 11 Sep 2003: