ticket:4 some fix