Fixed: Untranslatable tokens