commit #686