Fix persistence parsing