Fix for correct date formatting