Fix #862