One more patch to bug #300