Fix #783