ticket:13 fix errors