Fix for #8344