Fixed persistence bug