* Patch by Stefan Roese, 5 Jul 2005: