CL-12 : fix after codeReview