bug fix3 oleg
after merge