issue #1659