Fixed bug with wrong date format