commit #659