FIX CHOICE BUG
FIX CHOICE BUG