Fixed Issue with date