- Fix #868