Persistence fix