Fix the language selector... Resolves issue #420.