Fix for "Select Language" selecting after another language