Duplicate Date fix