Fix for Bug 311