Correctly handle new year