ticket:10 some fixess