Fix issue #64