Fix bug in choices