Fix for languages other than English not being set properly