Fixes issue #7073.