Addition to the fix for #2642.