Fix issue #1197

Fix issue #1197