fixed issue #83