replay bugs fix