ticket:8 fix