issue #1361