issue #1237