Fixed main language handling