commit #663