Apply Luca Molari <molari.luca@gmail.com> modifications

Signed-off-by: BTAN <BTAN@MF110187.lafayette.micropole.com>