fixed issue #84