ticket:10 making fixex according to comments