Hum, does that make sens? I.e. if there is no timestamp, do we really want to create a fake one. I think that I would prefer to keep none.