Proposal to fix the language selection bug