Fix issue #98