Fix remove call