Patch to Fix Bug-793785 and Bug-881185