Rebased3 fix replay