Fixed bug with date formatting handling & example