Fix #822