fix persistency issue