@zakareiae

Hello,

I have worked on addressing this issue and have created a patch to resolve it. Here is a brief overview of my changes:

I have tested these changes locally, and they seem to fix the problem. Please review them and provide your feedback.