commit #680