Issue #860 fixed