fixed translation related issues