Fixed up persistence