Fix for #7351.
Fix for #7352.