Fix issue #62