- Fix #862