Patch by Stefan Roese, 02 Jul 2004