commit #670