Fix for #6601