Fixed issue #3117