Patch by Pierre Aubert, 15 Mar 2004: