Fix issue #54