Fix for #8025