Fix for bug 460