fixed issue #1939