ticket:9 fix t