Fix #790