I think this may also be worth fixing in the backend, as I see it as the sort of thing that is going to bite elsewhere