Patch by Mathijs Haarman, 08 May 2003: