Fix for {{lang}} issues