Patch #3 Works, But more correction is required to fix the issue.
Updated pat...