Bug Fix for bug 4063.