fix issue with persistance