IMPROVEMENT for bug 11236