commit #687