PM-360 : improved translationhandling