Fixed issue #1835