Fixed bug with wrong date