I updated my pull request with this change:
If there’s a different solution, I’ll remove that fix from the PR
Link to pull request:
Please review and merge