issue #65 fixed