fixed Issue #96