ticket:7 fix