resolve DayOfWeek issues