fix issue #57