fixed issue #96