fixed Issue #860