Fix issue #59