improved translate handling