Fixed issue #3163