Rebased3 fix replay

Comments are awesome.