BUG 11718 IMPROVEMENT