fix lang ok by: Armando