Fix issue #101