Satya - BugFixes

esign changes for self case