Corrected for new translation support