Fixes the persistence memory issue