Fix for Bug 3