Patch by Thomas Viehweger, 14 May 2004: