issue #860