Fix bug on date