issue #83 fixed