fix issue with persistance, including reset