Fixes issue #4120