#46: fix some translation mapping logic