Fix remove company bug