Fix remove issue