* Patch by Andre Schwarz, 24 Nov 2003: