Fix remove block