issue #1589