more info: the added tests should expose both scenarios, so it would be a good thing to run them with and without this, to be sure.