Ordering fixed with Class requirement