Fixed Patch Issue