Further fix to bug #20230