I think I've got a unit test that asserts the issue, I'm going to push it to a branch named after the issue number and raise a draft PR for further discussion