Fixed issue #1677