At this point I don't care

Fixed issue with replay mechanism