Fix issue #108