Fix for #9244.