Better fix for DAY_OF_WEEK