make lang-selection a bit more robust..