Fix #826