Patch by Stefan Roese, 16 Sep 2004