issue #1619