Fix issue #137

Fix issue #137