Fix rewinding issue on XU. U2 still has some issues.