commit #648