Fix for bug 1052395