Small improvement for fix to bug#8164.