issue #54