Save payment state fix