* Patch by Stefan Roese, 1 Jul 2005: