issue #96