fix2 без noff
Merge branch 'hotfix2'