Patch by Stefan Roese , 25 Mar 2003.