Use translation - closes #578