Fix #795