Fixed issue #1839