translation bug fix
merge