issue #1240