fixed issue #81