Fix highlight when replaying