Fix for #3255.