Fix issues with multple threads sorting org at same time