ticket:1 fix errors