Fix for replay