Fix issue #1182

Fix issue #1182