Fix for Bug 2411