#20 fixed persistence