commit #681