Fix #868