Fixed issue #1944