Language support fix +