Fixed issue #1971