Fix for bug 1711