issue #1364