Fix issue #51