Resolve issues with lost data