issue #114 fixed