Ensure effective_year and next_year are consistent after Jan 1