Second fix of the bug #94 (see my last comment for the bug).