Fix for bug 2285