Patch 2 for bug 45