Fix remove fail #1