Fix Choose Bug