fixed persistence between views