Replay bugfix