Fixed bug related to date display