Fixed bug when switching from non-default language to other non-default language