Getting kicked out of the settlement that you are given in a peace deal

[BrianKindly]

If you are attacking a settlement, and come to a peace deal, and that said settlement is given to you in the peace deal, your units get kicked of the city before it becomes yours.

Obviously, if you are attacking a settlement and simultaneously it is given to you in peace, your units shouldn't be kicked out....it's yours now. Seems like something that just needs the order of events happening in the peace process. In the code, the war must be technically ending before the settlement is transferred, therefore going to a hostile relationship without open borders and yeeeeeeeeeet.