Fix issue #57