Fix #866