Fix issue #179

Fix issue #179