Fix for bug 1014837