fixed execute_choice
fixed execute_choice