Fix #786