fix language return problems