Fixing a doing-it-wrong with dates