Fix responsese to code review 194.