Fix issue where about replace code could cause items to remove if ref…

Fix issue where about replace code could cause items to remove if ref… #6125