Fix remove address