Fixes persistance issues