Choice Function and Ranking Fix