fixed according to Yury requirements (gavryushov)