Fixed translation-handling