[WIP] Fix code as per review comment 3307039155

[Copilot]

• Identify the exact PR review comment and target file for comment r3307039155
• Inspect current implementation and any required binding configuration
• Run existing build/test checks relevant to the touched area to capture baseline state
• Apply only the minimal code change required by the linked review comment
• Run targeted validation for the changed area
• Run parallel validation and summarize results