issue #1673