commit #645