Revert "Fixed Translation bug"

This reverts commit 2c85fb0f878bb72e6aea0a58c00db4352bcbde33.
Revert "Revert "Fixed Translation bug""

This reverts commit db234d730441a160c6ba53afe20cadd4dbfdab36.