BUG 5965 IMPROVEMENT