Fix #797