Fixed issue #4310