Fixed issue #1876