Improve translator function. Ref #14