Fixed issue #1898