Modified to always add padding date (this ways should be more portable).