Fix issue #4416