Second part of bug 4050 fix