Fix issue #105