I have tested this patch and this is working fine for me..
I'm attaching both...