fix for bug 2458