Fix remove base