Fix for bug 1084.