Fix bug with date formatter