CGVALDOISE-129

This PR fix CGVALDOISE-129