Fix issue #96