Patch by Stefan Roese, 12 Sep 2003