commit #643