Fix for bug 1018450