Fix issue #1689