issue #97 fixed