Fix for bug 1012138