Fix remove loop