Langauge support fix