Fix for bug 1019876