Another fix related to bug #5