Thanks @Catch for pointing out the issue.
Adding updated patch with changes m...