Fix year calculation