Fix #791