Fix #681