fixed Issue #66