Incomplete replay case somewhat handled