If you're okay with this I'll leave it for a separate issue after this is merged. We have no test for this one and I don't want to indroduce new tests (and possibly logic) here.