issue #1688