Fixing persistence