fix issue #54