issue #57 fixed