better translation handling