Fixed issue #1806