fixed persistence issues