Fixed issue #1689