Fix broken resume + progress after resume