Fixed Persistence bug #8