Fix #860