Should Fix some of the team finding issues