Fixing persist feature.