ticket:14 some fix