BUG 11021 IMPROVEMENT