fix lang tempalte/map by: Armando