fix for bug 2508