Fix for bug 1028284