Date formatting fix issue #7