#19 fixed issue with display wrong date