Fixed problem with date