ticket:1 fixed errors