Fix for bug 517.