Fixed issue #96