Merge pull request #607 from 981213/fix-translate