Handle incomplete replays better