BUG 14390 Improvement