ticket:4 fix