#22 Restore translation algorithm