To fix the above issue, Please check and review the patch.
After patch: