Patch at #4 was not applying ,so i have added new logic which is checking not...