[QAE1037] code review corrects