Fixed the Choice class