Fix issue #97