BUG 12141 IMPROVEMENT