ticket:2 some fix