Changed thread sorting to follow same calls as others