Fixing Bug 1040998