Fix issue #4209