Fixe PNM-1936 and change translate