CGVALDOISE-129 - fix problem 2