Update chosen, closes #2594