Fix issue #65