Fix issue #98

Fix #98