* Patch by David Müller, 13 Sep 2003: