Handle date
Fix bug
Handle date