issue #1612