(Or at least this is one problem; I guess this part is not unit-tested, which is a problem in itself, but it would break with the change.)