Fix for bug 2555