Persistence bug fixed