ticket:6 fix