Fixes issue created by #8749