Fix issue with years not matching sometimes