Fix issue #69