Fixed #681