Improve some fix that Rodolfo say.