Fix for #7232.
Fix for #7204.