Fixed issues with translation