fixed Issue #76