Fix for replaying