CHANGE: Persistence bug fixing.