Fixed bug with the choices