Fixed issue #1932