Fixed handling of open-choice input