Before applying patch:
After applying patch:
Code looks good. Thanks @zeeshan...