Bugfixing. NB: This is candidate to format translator