ticket:6 some fix