Trying to fix the persistence bug