issue #1224