Fixed bug with wrong dates