Fix NRE
Replay changed implementation