Fix issue #106