Can you give some more background about when this will come up? I'll add a unit test to cover it