issue #1594