Adding Patch to Fix Bug - 1011584