Fixed issue #1929