Fix #793