Fix issue #4702