issue #1356