issue #1611