Fix issue #103