Working to fix addr