Fix persistance