Multi-lang working better now