Fix for #7324.