Philip Leishman - 2026-05-22

I have a potential fix for this
See merge request.