Fixed issue #3172