[WIP] Fix code based on review comment

[Copilot]

Thanks for asking me to work on this. I will get started on it and keep this PR's description up to date as I form a plan and make progress.

@copilot Fix the code for only this review comment.

When a review comment includes a suggested change, apply the suggestion exactly unless the instructions in the 'Additional instructions' section below indicate otherwise.

Do not make changes beyond what is described in the linked review comment, unless requested in the 'Additional instructions' section below.