ticket:6 fix history