fix persistence problem