Fix for bug 1047957