Ukraine bug fix