Language support fix