Fix for bug 1049064