Fixed issue #1938