Fix for #6471