Fix issue #75