* Patch by Martin Winistoerfer, 23 Mar 2003