Fixes issue #9091