fixed Date formatting issue