fixed persistence
merged