ticket:6 fix bug