BUG 11052 IMPROVEMENT