Fix issue #74