V1.592 : Fix choice selector